Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / RNode_Firmware.git / commits / 9ee61ee


Commit 9ee61ee95f93f8456699fbb84e3981d32f0b6ff5

󰉖 Browse tree at this commit

Parents : fb976c8 fd68427
Author : Mark Qvist <mark@unsigned.io>
Date : 2022-01-08T14:35:48+01:00

Resolved merge conflict

Diff

diff --cc Config.h
index af7dff8,116ade9..e729380
--- a/Config.h
+++ b/Config.h
@@@ -4,9 -4,10 +4,10 @@@
#define CONFIG_H
#define MAJ_VERS 0x01
- #define MIN_VERS 0x11
+ #define MIN_VERS 0x12
#define MCU_1284P 0x91
+ #define MCU_2560 0x92
#define MODE_HOST 0x11
#define MODE_TNC 0x12


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────